Fix wrong span for hightlight for duplicated diff lines #147354
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @Muscraft |
rustbot
added
S-waiting-on-review
|
current output: |
|
The output for Before: Now: |
xizheyin
approved these changes
Oct 6, 2025
tests/ui/argument-suggestions/wrong-highlight-span-extra-arguments-147070.rs
Show resolved
Hide resolved
estebank
approved these changes
Oct 7, 2025
tests/ui/argument-suggestions/wrong-highlight-span-extra-arguments-147070.rs
Show resolved
Hide resolved
|
r=me after addressing comments |
chenyukang
force-pushed
the
yukang-fix-147070-wrong-highlight-span
branch
4 times, most recently
from
83a0258 to
4fcd3c0
Compare
chenyukang
force-pushed
the
yukang-fix-147070-wrong-highlight-span
branch
from
4fcd3c0 to
231c395
Compare
|
@bors r=estebank |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Oct 7, 2025
Rollup of 7 pull requests Successful merges: - #145495 (Use declarative macro for `#[derive(TryFromU32)]`) - #147165 (test: Subtract code_offset from width for ui_testing) - #147354 (Fix wrong span for hightlight for duplicated diff lines) - #147395 (Improve diagnostics: update note and add help message) - #147396 (Fluent tidy improvements) - #147407 (Update books) - #147413 (don't panic on extern with just multiple quotes in the name) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Oct 7, 2025
Rollup merge of #147354 - chenyukang:yukang-fix-147070-wrong-highlight-span, r=estebank Fix wrong span for hightlight for duplicated diff lines Fixes #147070 From comments: #147070 (comment) The lightlight row for diff must at least 2. r? `@estebank`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 7, 2025
…fmease Print tip for human error format in runtest When working on rust-lang#147354, spent some time to figure out that there is `//~ ERROR` left on test file, this PR will give a better error message for this scenario.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #147070
From comments: #147070 (comment)
The lightlight row for diff must at least 2.
r? @estebank